- MIDatabase::MetaDetouchSub = new method for the mc support virtualization

- further cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@8376 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 5 insertions, 3 deletions

diff --git a/src/modules/metacontacts/metacontacts.h b/src/modules/metacontacts/metacontacts.h
index bf314ca577..ecc28c7cca 100644
--- a/src/modules/metacontacts/metacontacts.h
+++ b/src/modules/metacontacts/metacontacts.h
@@ -33,17 +33,20 @@ INT_PTR TranslateMenuFunc(MCONTACT hContact, int i);
 

 // contact menu items

 void InitMenus();

-extern DWORD nextMetaID;

 extern int mcStatus;

 

+__forceinline bool IsMeta(DBCachedContact *cc) { return cc->nSubs != -1; }

+__forceinline bool IsSub(DBCachedContact *cc) { return cc->parentID != 0; }

+

 INT_PTR Meta_Convert(WPARAM wParam,LPARAM lParam);

 INT_PTR Meta_AddTo(WPARAM wParam,LPARAM lParam);

 INT_PTR Meta_Edit(WPARAM wParam,LPARAM lParam);

-void Meta_RemoveContactNumber(MCONTACT hMeta, int number);

 INT_PTR Meta_Delete(WPARAM wParam,LPARAM lParam);

 INT_PTR Meta_Default(WPARAM wParam,LPARAM lParam);

 INT_PTR Meta_ForceDefault(WPARAM wParam,LPARAM lParam);

 

+void Meta_RemoveContactNumber(DBCachedContact *cc, int number);

+

 INT_PTR Meta_IsEnabled();

 

 INT_PTR Meta_OnOff(WPARAM wParam, LPARAM lParam);

@@ -52,7 +55,6 @@ int Meta_ModifyMenu(WPARAM wParam,LPARAM lParam);
 BOOL Meta_Assign(MCONTACT src, MCONTACT dest, BOOL set_as_default);

 int Meta_SetNick(char *proto);

 int Meta_HideLinkedContacts(void);

-int Meta_UnhideLinkedContacts(void);

 int Meta_GetContactNumber(DBCachedContact *cc, MCONTACT hContact);

 int Meta_HideMetaContacts(int hide);

 int Meta_SuppressStatus(int suppress);