From d7df3cfb57f6c198a7a06fe5e74b63602ec678fe Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 19 Apr 2011 21:49:11 +0000 Subject: [PATCH] Monotone-Parent: 0736f4d4ec3208b934e9888e6cf09014b905774b Monotone-Revision: 3541b0465209c659178d752da6f97c5063fbc108 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-04-19T21:49:11 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ OpenChange/code-MAPIStorePropertySelectors.h | 4 ++-- OpenChange/code-MAPIStorePropertySelectors.m | 11 ++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index eec2a4c4b..9fb7c42d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-04-19 Wolfgang Sourdeau + * OpenChange/code-MAPIStorePropertySelectors.m + (MAPIStorePropertyGettersForClass): use the + "MAPIStoreProeprtyGetter" type rather than IMP as result type. + * OpenChange/MAPIStoreFolderTable.m (-restrictedChildKeys): no longer a mandatory method, returns [self childKeys] when not overriden and issue an error message. diff --git a/OpenChange/code-MAPIStorePropertySelectors.h b/OpenChange/code-MAPIStorePropertySelectors.h index f96d06f93..0f7590ed5 100644 --- a/OpenChange/code-MAPIStorePropertySelectors.h +++ b/OpenChange/code-MAPIStorePropertySelectors.h @@ -22,5 +22,5 @@ typedef int (*MAPIStorePropertyGetter) (id inst, SEL _cmd, void **data); -const IMP *MAPIStorePropertyGettersForClass (Class klass); -SEL MAPIStoreSelectorForPropertyGetter (register uint16_t propertyId); +const MAPIStorePropertyGetter *MAPIStorePropertyGettersForClass (Class klass); +SEL MAPIStoreSelectorForPropertyGetter (uint16_t propertyId); diff --git a/OpenChange/code-MAPIStorePropertySelectors.m b/OpenChange/code-MAPIStorePropertySelectors.m index 2a72fe91b..f44bdbadc 100644 --- a/OpenChange/code-MAPIStorePropertySelectors.m +++ b/OpenChange/code-MAPIStorePropertySelectors.m @@ -23,12 +23,12 @@ #import #import -const IMP * +const MAPIStorePropertyGetter * MAPIStorePropertyGettersForClass (Class klass) { static NSMapTable *classesTable = nil; - IMP *getters; - IMP getter; + MAPIStorePropertyGetter *getters; + MAPIStorePropertyGetter getter; uint16_t count, idx; SEL currentSel; @@ -40,7 +40,7 @@ MAPIStorePropertyGettersForClass (Class klass) getters = NSMapGet (classesTable, klass); if (!getters) { - getters = NSZoneCalloc (NULL, 65536, sizeof (IMP)); + getters = NSZoneCalloc (NULL, 65536, sizeof (MAPIStorePropertyGetter)); for (count = 0; count < 65535; count++) { idx = MAPIStorePropertyGettersIdx[count]; @@ -49,7 +49,8 @@ MAPIStorePropertyGettersForClass (Class klass) currentSel = MAPIStorePropertyGetterSelectors[idx]; if ([klass instancesRespondToSelector: currentSel]) { - getter = [klass instanceMethodForSelector: currentSel]; + getter = (MAPIStorePropertyGetter) + [klass instanceMethodForSelector: currentSel]; if (getter) getters[count] = getter; }