ObjFW  Check-in [7261ba5bd1]

Overview
Comment:More property cleanup.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 7261ba5bd1446959bfd12f8a1b38fe005b840fe71a9c8691a802f68a01741857
User & Date: js on 2012-10-02 11:20:55
Other Links: manifest | tags
Context
2012-10-03
15:41
Move definition of restricted to OFObject.h. check-in: 7239333455 user: js tags: trunk
2012-10-02
11:20
More property cleanup. check-in: 7261ba5bd1 user: js tags: trunk
11:05
OFHTTPRequestFailedException: Naming consistency check-in: 991ced5333 user: js tags: trunk
Changes

Modified src/OFApplication.h from [1aa58a5990] to [8da8c6a3f6].

117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
	void (*SIGHUPHandler)(id, SEL);
	void (*SIGUSR1Handler)(id, SEL);
	void (*SIGUSR2Handler)(id, SEL);
#endif
}

#ifdef OF_HAVE_PROPERTIES
@property (readonly, assign) OFString *programName;
@property (readonly, assign) OFArray *arguments;
@property (readonly, assign) OFDictionary *environment;
@property (assign) id <OFApplicationDelegate> delegate;
#endif

/**
 * \brief Returns the only OFApplication instance in the application.
 *
 * \return The only OFApplication instance in the application







|
|
|







117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
	void (*SIGHUPHandler)(id, SEL);
	void (*SIGUSR1Handler)(id, SEL);
	void (*SIGUSR2Handler)(id, SEL);
#endif
}

#ifdef OF_HAVE_PROPERTIES
@property (readonly, copy, nonatomic) OFString *programName;
@property (readonly, copy, nonatomic) OFArray *arguments;
@property (readonly, copy, nonatomic) OFDictionary *environment;
@property (assign) id <OFApplicationDelegate> delegate;
#endif

/**
 * \brief Returns the only OFApplication instance in the application.
 *
 * \return The only OFApplication instance in the application

Modified src/OFApplication.m from [5bede79f26] to [d77b6b1207].

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
{
	*argc_ = argc;
	*argv_ = argv;
}

- (OFString*)programName
{
	return programName;
}

- (OFArray*)arguments
{
	return arguments;
}

- (OFDictionary*)environment
{
	return environment;
}

- (id <OFApplicationDelegate>)delegate
{
	return delegate;
}








|




|




|







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
{
	*argc_ = argc;
	*argv_ = argv;
}

- (OFString*)programName
{
	OF_GETTER(programName, NO)
}

- (OFArray*)arguments
{
	OF_GETTER(arguments, NO)
}

- (OFDictionary*)environment
{
	OF_GETTER(environment, NO)
}

- (id <OFApplicationDelegate>)delegate
{
	return delegate;
}

Modified src/OFHTTPRequest.m from [b8e1935f38] to [8854292a15].

558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
- (short)statusCode
{
	return statusCode;
}

- (OFDictionary*)headers
{
	return [[headers copy] autorelease];
}

- (OFDataArray*)data
{
	return [[data retain] autorelease];
}
@end

@implementation OFObject (OFHTTPRequestDelegate)
-   (void)request: (OFHTTPRequest*)request
  didCreateSocket: (OFTCPSocket*)socket
{







|




|







558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
- (short)statusCode
{
	return statusCode;
}

- (OFDictionary*)headers
{
	OF_GETTER(headers, YES)
}

- (OFDataArray*)data
{
	OF_GETTER(data, YES)
}
@end

@implementation OFObject (OFHTTPRequestDelegate)
-   (void)request: (OFHTTPRequest*)request
  didCreateSocket: (OFTCPSocket*)socket
{

Modified src/OFNumber.h from [3edba1d1a0] to [5d836abad6].

92
93
94
95
96
97
98




99
100
101
102
103
104
105
		intptr_t       intptr;
		uintptr_t      uintptr;
		float	       float_;
		double	       double_;
	} value;
	of_number_type_t type;
}





/**
 * \brief Creates a new OFNumber with the specified BOOL.
 *
 * \param bool_ A BOOL which the OFNumber should contain
 * \return A new autoreleased OFNumber
 */







>
>
>
>







92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
		intptr_t       intptr;
		uintptr_t      uintptr;
		float	       float_;
		double	       double_;
	} value;
	of_number_type_t type;
}

#ifdef OF_HAVE_PROPERTIES
@property (readonly) of_number_type_t type;
#endif

/**
 * \brief Creates a new OFNumber with the specified BOOL.
 *
 * \param bool_ A BOOL which the OFNumber should contain
 * \return A new autoreleased OFNumber
 */

Modified src/OFTimer.h from [7baf2bee73] to [3a4d8a5c86].

37
38
39
40
41
42
43




44
45
46
47
48
49
50
	BOOL repeats;
#ifdef OF_HAVE_BLOCKS
	of_timer_block_t block;
#endif
	BOOL isValid, done;
	OFCondition *condition;
}





/**
 * \brief Creates and schedules a new timer with the specified time interval.
 *
 * \param interval The time interval after which the timer should be executed
 *		   when fired
 * \param target The target on which to call the selector







>
>
>
>







37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
	BOOL repeats;
#ifdef OF_HAVE_BLOCKS
	of_timer_block_t block;
#endif
	BOOL isValid, done;
	OFCondition *condition;
}

#ifdef OF_HAVE_PROPERTIES
@property (readonly, retain) OFDate *fireDate;
#endif

/**
 * \brief Creates and schedules a new timer with the specified time interval.
 *
 * \param interval The time interval after which the timer should be executed
 *		   when fired
 * \param target The target on which to call the selector

Modified src/OFTimer.m from [acc1d91474] to [2c4f439273].

385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
		[[OFRunLoop currentRunLoop] addTimer: self];
	} else
		isValid = NO;
}

- (OFDate*)fireDate
{
	return [[fireDate retain] autorelease];
}

- (double)timeInterval
{
	return interval;
}








|







385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
		[[OFRunLoop currentRunLoop] addTimer: self];
	} else
		isValid = NO;
}

- (OFDate*)fireDate
{
	OF_GETTER(fireDate, YES)
}

- (double)timeInterval
{
	return interval;
}