ObjFW  Diff

Differences From Artifact [de75aa3e70]:

To Artifact [cf116e78a7]:


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
	OF_ORDERED_DESCENDING = 1
} of_comparison_result_t;

/**
 * \brief An enum for storing endianess.
 */
typedef enum of_byte_order_t {

	OF_BYTE_ORDER_BIG_ENDIAN,

	OF_BYTE_ORDER_LITTLE_ENDIAN
} of_byte_order_t;

/**
 * \brief A range.
 */
typedef struct of_range_t {
	/// The start of the range
	size_t location;
	/// The length of the range
	size_t length;
} of_range_t;

/**
 * \brief A point.
 */
typedef struct of_point_t {

	float x;

	float y;
} of_point_t;

/**
 * \brief A dimension.
 */
typedef struct of_dimension_t {

	float width;

	float height;
} of_dimension_t;

/**
 * \brief A rectangle.
 */
typedef struct of_rectangle_t
{

	of_point_t origin;

	of_dimension_t size;
} of_rectangle_t;

@class OFString;
@class OFThread;

/**







>

>

















>

>







>

>








>

>







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
	OF_ORDERED_DESCENDING = 1
} of_comparison_result_t;

/**
 * \brief An enum for storing endianess.
 */
typedef enum of_byte_order_t {
	/// Most significant byte first (big endian)
	OF_BYTE_ORDER_BIG_ENDIAN,
	/// Least significant byte first (little endian)
	OF_BYTE_ORDER_LITTLE_ENDIAN
} of_byte_order_t;

/**
 * \brief A range.
 */
typedef struct of_range_t {
	/// The start of the range
	size_t location;
	/// The length of the range
	size_t length;
} of_range_t;

/**
 * \brief A point.
 */
typedef struct of_point_t {
	/// The x coordinate of the point
	float x;
	/// The y coordinate of the point
	float y;
} of_point_t;

/**
 * \brief A dimension.
 */
typedef struct of_dimension_t {
	/// The width of the dimension
	float width;
	/// The height of the dimension
	float height;
} of_dimension_t;

/**
 * \brief A rectangle.
 */
typedef struct of_rectangle_t
{
	/// The point from where the rectangle originates
	of_point_t origin;
	/// The size of the rectangle
	of_dimension_t size;
} of_rectangle_t;

@class OFString;
@class OFThread;

/**
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339

/**
 * \brief The root class for all other classes inside ObjFW.
 */
@interface OFObject <OFObject>
{
@public
	/// The class of the object
	Class isa;
}

/**
 * \brief A method which is called once when the class is loaded into the
 *	  runtime.
 *







<







333
334
335
336
337
338
339

340
341
342
343
344
345
346

/**
 * \brief The root class for all other classes inside ObjFW.
 */
@interface OFObject <OFObject>
{
@public

	Class isa;
}

/**
 * \brief A method which is called once when the class is loaded into the
 *	  runtime.
 *
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
 * OFAllocFailedException.
 *
 * \return The allocated object
 */
+ alloc;

/**
 * \brief Allocates memory for a new instance and calls -[init] on it.
 * \return An allocated and initialized object
 */
+ new;

/**
 * \brief Returns the class.
 *







|







368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
 * OFAllocFailedException.
 *
 * \return The allocated object
 */
+ alloc;

/**
 * \brief Allocates memory for a new instance and calls \ref init on it.
 * \return An allocated and initialized object
 */
+ new;

/**
 * \brief Returns the class.
 *
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
 *
 * If the specified class is a superclass of the receiving class, nothing is
 * done.
 *
 * The methods which will be added from the specified class are not allowed to
 * use super or access instance variables, instead they have to use accessors.
 *
 * \param class The class from which the instance methods should be inherited
 */
+ (void)inheritMethodsFromClass: (Class)class_;

/**
 * \brief Try to resolve the specified class method.
 *
 * This method is called if a class method was not found, so that an







|







517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
 *
 * If the specified class is a superclass of the receiving class, nothing is
 * done.
 *
 * The methods which will be added from the specified class are not allowed to
 * use super or access instance variables, instead they have to use accessors.
 *
 * \param class_ The class from which the instance methods should be inherited
 */
+ (void)inheritMethodsFromClass: (Class)class_;

/**
 * \brief Try to resolve the specified class method.
 *
 * This method is called if a class method was not found, so that an
537
538
539
540
541
542
543
544



545
546

547
548
549
550
551
552
553
 * \return Whether the method has been added to the class
 */
+ (BOOL)resolveInstanceMethod: (SEL)selector;

/**
 * \brief Initializes an already allocated object.
 *
 * Derived classes may override this, but need to do self = [super init] before



 * they do any initialization themselves. init may never return nil, instead
 * an exception (for example OFInitializationFailed) should be thrown.

 *
 * \return An initialized object
 */
- init;

/**
 * \brief Returns the name of the object's class.







|
>
>
>
|
|
>







544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
 * \return Whether the method has been added to the class
 */
+ (BOOL)resolveInstanceMethod: (SEL)selector;

/**
 * \brief Initializes an already allocated object.
 *
 * Derived classes may override this, but need to do
 * \code
 *   self = [super init]
 * \endcode
 * before they do any initialization themselves. \ref init may never return nil,
 * instead an exception (for example OFInitializationFailedException) should be
 * thrown.
 *
 * \return An initialized object
 */
- init;

/**
 * \brief Returns the name of the object's class.