You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by to...@apache.org on 2007/12/09 01:27:14 UTC
svn commit: r602591 - /cayenne/sandbox/CocoaCayenne/CocoaCayenne/
Author: torehalset
Date: Sat Dec 8 16:27:13 2007
New Revision: 602591
URL: http://svn.apache.org/viewvc?rev=602591&view=rev
Log:
int -> NSInteger
Modified:
cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodeDiff.h
cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodeDiff.m
cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodePropertyChangeOperation.h
cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodePropertyChangeOperation.m
cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjAttribute.h
cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjAttribute.m
cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectIdQuery.h
cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectIdQuery.m
cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectStore.h
cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectStore.m
cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYPersistentObject.h
cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYPersistentObject.m
cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYSyncMessage.h
cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYSyncMessage.m
cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYUtil.h
cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYUtil.m
Modified: cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodeDiff.h
URL: http://svn.apache.org/viewvc/cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodeDiff.h?rev=602591&r1=602590&r2=602591&view=diff
==============================================================================
--- cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodeDiff.h (original)
+++ cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodeDiff.h Sat Dec 8 16:27:13 2007
@@ -23,12 +23,12 @@
@class CAYObjectStore;
@interface CAYNodeDiff : NSObject <NSCoding> {
- int diffId;
+ NSInteger diffId;
NSObject *nodeId;
}
-(id)initWithNodeId:(id)nid;
--(id)initWithNodeId:(id)nid diffId:(int)did;
+-(id)initWithNodeId:(id)nid diffId:(NSInteger)did;
-(void)setNodeId:(NSObject *)nid;
-(NSObject *)nodeId;
Modified: cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodeDiff.m
URL: http://svn.apache.org/viewvc/cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodeDiff.m?rev=602591&r1=602590&r2=602591&view=diff
==============================================================================
--- cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodeDiff.m (original)
+++ cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodeDiff.m Sat Dec 8 16:27:13 2007
@@ -29,7 +29,7 @@
return self;
}
--(id)initWithNodeId:(id)nid diffId:(int)did
+-(id)initWithNodeId:(id)nid diffId:(NSInteger)did
{
[self initWithNodeId:nid];
diffId = did;
Modified: cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodePropertyChangeOperation.h
URL: http://svn.apache.org/viewvc/cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodePropertyChangeOperation.h?rev=602591&r1=602590&r2=602591&view=diff
==============================================================================
--- cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodePropertyChangeOperation.h (original)
+++ cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodePropertyChangeOperation.h Sat Dec 8 16:27:13 2007
@@ -27,7 +27,7 @@
}
-(id)initWithNodeId:(NSObject *)nid property:(NSString *)prop oldValue:(NSObject *)oldVal newValue:(NSObject *)newVal;
--(id)initWithNodeId:(NSObject *)nid property:(NSString *)prop oldValue:(NSObject *)oldVal newValue:(NSObject *)newVal diffId:(int)did;
+-(id)initWithNodeId:(NSObject *)nid property:(NSString *)prop oldValue:(NSObject *)oldVal newValue:(NSObject *)newVal diffId:(NSInteger)did;
-(void)setProperty:(NSString *)p;
-(NSString *)property;
Modified: cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodePropertyChangeOperation.m
URL: http://svn.apache.org/viewvc/cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodePropertyChangeOperation.m?rev=602591&r1=602590&r2=602591&view=diff
==============================================================================
--- cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodePropertyChangeOperation.m (original)
+++ cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYNodePropertyChangeOperation.m Sat Dec 8 16:27:13 2007
@@ -32,7 +32,7 @@
return self;
}
--(id)initWithNodeId:(NSObject *)nid property:(NSString *)prop oldValue:(NSObject *)oldVal newValue:(NSObject *)newVal diffId:(int)did
+-(id)initWithNodeId:(NSObject *)nid property:(NSString *)prop oldValue:(NSObject *)oldVal newValue:(NSObject *)newVal diffId:(NSInteger)did
{
[self initWithNodeId:nid property:prop oldValue:oldVal newValue:newVal];
diffId = did;
Modified: cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjAttribute.h
URL: http://svn.apache.org/viewvc/cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjAttribute.h?rev=602591&r1=602590&r2=602591&view=diff
==============================================================================
--- cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjAttribute.h (original)
+++ cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjAttribute.h Sat Dec 8 16:27:13 2007
@@ -28,7 +28,7 @@
NSString *name;
NSString *javaType;
BOOL mandatory;
- int maxLength;
+ NSInteger maxLength;
}
@@ -38,7 +38,7 @@
-(NSString *)javaType;
-(void)setMandatory:(BOOL)m;
-(BOOL)isMandatory;
--(void)setMaxLength:(int)ml;
--(int)maxLength;
+-(void)setMaxLength:(NSInteger)ml;
+-(NSInteger)maxLength;
@end
Modified: cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjAttribute.m
URL: http://svn.apache.org/viewvc/cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjAttribute.m?rev=602591&r1=602590&r2=602591&view=diff
==============================================================================
--- cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjAttribute.m (original)
+++ cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjAttribute.m Sat Dec 8 16:27:13 2007
@@ -75,12 +75,12 @@
return mandatory;
}
--(void)setMaxLength:(int)ml
+-(void)setMaxLength:(NSInteger)ml
{
maxLength = ml;
}
--(int)maxLength
+-(NSInteger)maxLength
{
return maxLength;
}
Modified: cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectIdQuery.h
URL: http://svn.apache.org/viewvc/cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectIdQuery.h?rev=602591&r1=602590&r2=602591&view=diff
==============================================================================
--- cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectIdQuery.h (original)
+++ cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectIdQuery.h Sat Dec 8 16:27:13 2007
@@ -25,15 +25,15 @@
@interface CAYObjectIdQuery : CAYQuery <NSCoding> {
CAYObjectId *objectId;
- unsigned int cachePolicy;
+ NSUInteger cachePolicy;
BOOL fetchingDataRows;
}
-(void)setObjectId:(CAYObjectId *)oid;
-(CAYObjectId *)objectId;
--(void)setCachePolicy:(unsigned int)cp;
--(unsigned int)cachePolicy;
+-(void)setCachePolicy:(NSUInteger)cp;
+-(NSUInteger)cachePolicy;
-(void)setFetchingDataRows:(BOOL)fdr;
-(BOOL)isFetchingDataRows;
Modified: cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectIdQuery.m
URL: http://svn.apache.org/viewvc/cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectIdQuery.m?rev=602591&r1=602590&r2=602591&view=diff
==============================================================================
--- cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectIdQuery.m (original)
+++ cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectIdQuery.m Sat Dec 8 16:27:13 2007
@@ -62,12 +62,12 @@
return objectId;
}
--(void)setCachePolicy:(unsigned int)cp
+-(void)setCachePolicy:(NSUInteger)cp
{
cachePolicy = cp;
}
--(unsigned int)cachePolicy
+-(NSUInteger)cachePolicy
{
return cachePolicy;
}
Modified: cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectStore.h
URL: http://svn.apache.org/viewvc/cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectStore.h?rev=602591&r1=602590&r2=602591&view=diff
==============================================================================
--- cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectStore.h (original)
+++ cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectStore.h Sat Dec 8 16:27:13 2007
@@ -33,7 +33,7 @@
}
-(void)registerDiff:(CAYNodeDiff *)diff;
--(unsigned int)diffCount;
+-(NSUInteger)diffCount;
// TODO: should not return a mutable!
-(NSMutableArray *)diffs;
-(void)removeAllDiffs;
Modified: cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectStore.m
URL: http://svn.apache.org/viewvc/cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectStore.m?rev=602591&r1=602590&r2=602591&view=diff
==============================================================================
--- cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectStore.m (original)
+++ cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYObjectStore.m Sat Dec 8 16:27:13 2007
@@ -65,7 +65,7 @@
[diffsForSingleObjectId addObject:diff];
}
--(unsigned int)diffCount
+-(NSUInteger)diffCount
{
return [diffs count];
}
Modified: cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYPersistentObject.h
URL: http://svn.apache.org/viewvc/cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYPersistentObject.h?rev=602591&r1=602590&r2=602591&view=diff
==============================================================================
--- cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYPersistentObject.h (original)
+++ cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYPersistentObject.h Sat Dec 8 16:27:13 2007
@@ -25,15 +25,15 @@
@interface CAYPersistentObject : NSObject <NSCoding> {
CAYObjectId *objectId;
- unsigned int persistenceState;
+ NSUInteger persistenceState;
CAYObjectContext *objectContext;
NSMutableDictionary *values;
}
-(void)setObjectId:(CAYObjectId *)oid;
-(CAYObjectId *)objectId;
--(void)setPersistenceState:(unsigned int)state;
--(unsigned int)persistenceState;
+-(void)setPersistenceState:(NSUInteger)state;
+-(NSUInteger)persistenceState;
-(void)setObjectContext:(CAYObjectContext *)ctxt;
-(CAYObjectContext *)objectContext;
Modified: cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYPersistentObject.m
URL: http://svn.apache.org/viewvc/cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYPersistentObject.m?rev=602591&r1=602590&r2=602591&view=diff
==============================================================================
--- cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYPersistentObject.m (original)
+++ cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYPersistentObject.m Sat Dec 8 16:27:13 2007
@@ -31,7 +31,7 @@
@interface CAYPersistentObject (PrivateMethods)
--(void)createValidationError:(NSString *)errorMessage code:(int)errorCode error:(NSError **)outError;
+-(void)createValidationError:(NSString *)errorMessage code:(NSInteger)errorCode error:(NSError **)outError;
-(NSUndoManager *)undoManager;
@end
@@ -73,7 +73,7 @@
return objectId;
}
--(void)setPersistenceState:(unsigned int)state
+-(void)setPersistenceState:(NSUInteger)state
{
persistenceState = state;
@@ -84,7 +84,7 @@
}
}
--(unsigned int)persistenceState
+-(NSUInteger)persistenceState
{
return persistenceState;
}
@@ -607,7 +607,7 @@
@implementation CAYPersistentObject (PrivateMethods)
--(void)createValidationError:(NSString *)errorMessage code:(int)errorCode error:(NSError **)outError
+-(void)createValidationError:(NSString *)errorMessage code:(NSInteger)errorCode error:(NSError **)outError
{
NSDictionary *userInfoDict = [NSDictionary dictionaryWithObject:errorMessage
forKey:NSLocalizedDescriptionKey];
Modified: cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYSyncMessage.h
URL: http://svn.apache.org/viewvc/cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYSyncMessage.h?rev=602591&r1=602590&r2=602591&view=diff
==============================================================================
--- cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYSyncMessage.h (original)
+++ cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYSyncMessage.h Sat Dec 8 16:27:13 2007
@@ -23,12 +23,12 @@
@interface CAYSyncMessage : CAYClientMessage <NSCoding> {
- int type;
+ NSInteger type;
NSObject *senderChanges;
}
--(id)initWithType:(int)t senderChanges:(NSObject *)changes;
+-(id)initWithType:(NSInteger)t senderChanges:(NSObject *)changes;
-(void)setSenderChanges:(NSObject *)s;
-(NSObject *)senderChanges;
Modified: cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYSyncMessage.m
URL: http://svn.apache.org/viewvc/cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYSyncMessage.m?rev=602591&r1=602590&r2=602591&view=diff
==============================================================================
--- cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYSyncMessage.m (original)
+++ cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYSyncMessage.m Sat Dec 8 16:27:13 2007
@@ -23,7 +23,7 @@
@implementation CAYSyncMessage
--(id)initWithType:(int)t senderChanges:(NSObject *)changes
+-(id)initWithType:(NSInteger)t senderChanges:(NSObject *)changes
{
[super init];
type = t;
Modified: cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYUtil.h
URL: http://svn.apache.org/viewvc/cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYUtil.h?rev=602591&r1=602590&r2=602591&view=diff
==============================================================================
--- cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYUtil.h (original)
+++ cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYUtil.h Sat Dec 8 16:27:13 2007
@@ -25,6 +25,6 @@
}
+(BOOL)nilSafe:(id)a isEqualTo:(id)b;
-+(NSData *)createRandomDataWithLength:(int)length;
++(NSData *)createRandomDataWithLength:(NSUInteger)length;
@end
Modified: cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYUtil.m
URL: http://svn.apache.org/viewvc/cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYUtil.m?rev=602591&r1=602590&r2=602591&view=diff
==============================================================================
--- cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYUtil.m (original)
+++ cayenne/sandbox/CocoaCayenne/CocoaCayenne/CAYUtil.m Sat Dec 8 16:27:13 2007
@@ -37,10 +37,10 @@
return [a isEqualTo:b];
}
-+(NSData *)createRandomDataWithLength:(int)length
++(NSData *)createRandomDataWithLength:(NSUInteger)length
{
- int randombytes[length];
- int i;
+ NSInteger randombytes[length];
+ NSInteger i;
for(i = 0; i < length; i++)
{
randombytes[i] = rand();