From 2922f15ca7fbf2f9319b96efafd7e2c809ebc46f Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Tue, 13 May 2014 18:03:37 -0400 Subject: [PATCH] More rename --- OpenChange/SOGoMAPIDBFolder.h | 2 +- OpenChange/SOGoMAPIDBFolder.m | 2 +- OpenChange/SOGoMAPIDBObject.h | 8 ++++---- OpenChange/SOGoMAPIDBObject.m | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/OpenChange/SOGoMAPIDBFolder.h b/OpenChange/SOGoMAPIDBFolder.h index d055291bc..244e5a849 100644 --- a/OpenChange/SOGoMAPIDBFolder.h +++ b/OpenChange/SOGoMAPIDBFolder.h @@ -47,7 +47,7 @@ - (NSArray *) toOneRelationshipKeys; - (NSArray *) toManyRelationshipKeys; -- (NSArray *) childKeysOfType: (MAPIDBObjectType) type +- (NSArray *) childKeysOfType: (SOGoCacheObjectType) type includeDeleted: (BOOL) includeDeleted matchingQualifier: (EOQualifier *) qualifier andSortOrderings: (NSArray *) sortOrderings; diff --git a/OpenChange/SOGoMAPIDBFolder.m b/OpenChange/SOGoMAPIDBFolder.m index 76522f30e..41f5853b5 100644 --- a/OpenChange/SOGoMAPIDBFolder.m +++ b/OpenChange/SOGoMAPIDBFolder.m @@ -134,7 +134,7 @@ Class SOGoMAPIDBObjectK = Nil; // return [SOGoMAPIDBMessage objectWithName: filename inContainer: self]; // } -- (NSArray *) childKeysOfType: (MAPIDBObjectType) type +- (NSArray *) childKeysOfType: (SOGoCacheObjectType) type includeDeleted: (BOOL) includeDeleted matchingQualifier: (EOQualifier *) qualifier andSortOrderings: (NSArray *) sortOrderings diff --git a/OpenChange/SOGoMAPIDBObject.h b/OpenChange/SOGoMAPIDBObject.h index 4d2b0d0c0..a608da51a 100644 --- a/OpenChange/SOGoMAPIDBObject.h +++ b/OpenChange/SOGoMAPIDBObject.h @@ -38,14 +38,14 @@ typedef enum { MAPIMessageCacheObject = 2, MAPIFAICacheObject = 3, MAPIInternalCacheObject = 99 /* object = property list */ -} MAPIDBObjectType; +} SOGoCacheObjectType; @interface SOGoMAPIDBObject : SOGoMAPIObject { NSURL *tableUrl; BOOL initialized; /* safe guard */ - MAPIDBObjectType objectType; + SOGoCacheObjectType objectType; NSInteger version; BOOL deleted; } @@ -67,8 +67,8 @@ typedef enum { - (NSDictionary *) lookupRecord: (NSString *) path newerThanVersion: (NSInteger) startVersion; -- (void) setObjectType: (MAPIDBObjectType) newObjectType; -- (MAPIDBObjectType) objectType; /* message, fai, folder */ +- (void) setObjectType: (SOGoCacheObjectType) newObjectType; +- (SOGoCacheObjectType) objectType; /* message, fai, folder */ /* automatically set from actions */ - (BOOL) deleted; diff --git a/OpenChange/SOGoMAPIDBObject.m b/OpenChange/SOGoMAPIDBObject.m index 0ebc3af6f..d137c7bc1 100644 --- a/OpenChange/SOGoMAPIDBObject.m +++ b/OpenChange/SOGoMAPIDBObject.m @@ -188,12 +188,12 @@ static EOAttribute *textColumn = nil; return path; } -- (void) setObjectType: (MAPIDBObjectType) newObjectType +- (void) setObjectType: (SOGoCacheObjectType) newObjectType { objectType = newObjectType; } -- (MAPIDBObjectType) objectType /* message, fai, folder */ +- (SOGoCacheObjectType) objectType /* message, fai, folder */ { return objectType; }