Differences From Artifact [f7f23cc369]:
- File
src/OFURL.h
— part of check-in
[80e1a9655b]
at
2015-06-17 22:11:31
on branch trunk
— Add OF_NULLABLE_PROPERTY
This is necessary to make GCC (>= 4.6 and Apple GCC) happy as they don't
like the list of property attributes ending in a comma. (user: js, size: 4870) [annotate] [blame] [check-ins using]
To Artifact [3cbefbabba]:
- File
src/OFURL.h
— part of check-in
[48980f2297]
at
2015-11-29 11:43:05
on branch trunk
— Make properties a requirement and clean up code
This increases the required GCC version from 4.0 to 4.6 (exception:
Apple GCC, which already supports this with >= 4.0 starting with OS X
10.5). Since even GCC 4.6 is really old by now, there is no point in
still supporting something even older and making the code ugly because
of that. While some hardware and OS support was dropped from GCC 4.6
compared to GCC 4.0, there is nothing in there that would be an
interesting target with the exception of BeOS maybe - but a port to BeOS
can also be achieved using the Haiku support. The other dropped OSes are
mostly old versions of OSes while newer ones are still being supported
(and those newer versions of those OSes still support the same
hardware). (user: js, size: 2942) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
29 30 31 32 33 34 35 |
@interface OFURL: OFObject <OFCopying, OFSerialization>
{
OFString *_scheme, *_host;
uint16_t _port;
OFString *_user, *_password, *_path, *_parameters, *_query, *_fragment;
}
| > > > > | > > > | > > > > > > > > | > > > > > > > > > > > > > | | > > > > > > > > > | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 |
@interface OFURL: OFObject <OFCopying, OFSerialization>
{
OFString *_scheme, *_host;
uint16_t _port;
OFString *_user, *_password, *_path, *_parameters, *_query, *_fragment;
}
/*!
* The scheme part of the URL.
*/
@property (copy) OFString *scheme;
/*!
* The host part of the URL.
*/
@property (copy) OFString *host;
/*!
* The port part of the URL.
*/
@property uint16_t port;
/*!
* The user part of the URL.
*/
@property OF_NULLABLE_PROPERTY (copy) OFString *user;
/*!
* The password part of the URL.
*/
@property OF_NULLABLE_PROPERTY (copy) OFString *password;
/*!
* The path part of the URL.
*/
@property (copy) OFString *path;
/*!
* The parameters part of the URL.
*/
@property OF_NULLABLE_PROPERTY (copy) OFString *parameters;
/*!
* The query part of the URL.
*/
@property OF_NULLABLE_PROPERTY (copy) OFString *query;
/*!
* The fragment part of the URL.
*/
@property OF_NULLABLE_PROPERTY (copy) OFString *fragment;
/*!
* Creates a new URL.
*
* @return A new, autoreleased OFURL
*/
+ (instancetype)URL;
|
| ︙ | ︙ | |||
81 82 83 84 85 86 87 88 | * @param string A string describing a URL * @param URL A URL to which the string is relative * @return An initialized OFURL */ - initWithString: (OFString*)string relativeToURL: (OFURL*)URL; /*! | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 | * @param string A string describing a URL * @param URL A URL to which the string is relative * @return An initialized OFURL */ - initWithString: (OFString*)string relativeToURL: (OFURL*)URL; /*! * @brief Returns the URL as a string. * * @return The URL as a string */ - (OFString*)string; @end OF_ASSUME_NONNULL_END |