MRA:

- r/o server groups' support
- extensive use of CMStringA
- further code cleaning

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

1 files changed, 12 insertions, 8 deletions

diff --git a/protocols/MRA/src/MraProto.h b/protocols/MRA/src/MraProto.h
index 79fd39359b..cbd3d8d064 100644
--- a/protocols/MRA/src/MraProto.h
+++ b/protocols/MRA/src/MraProto.h
@@ -18,16 +18,18 @@
 

 struct MRA_FILES_QUEUE_ITEM;

 

-BOOL	DB_GetStaticStringA(HANDLE hContact, LPCSTR lpszModule, LPCSTR lpszValueName, LPSTR lpszRetBuff, size_t dwRetBuffSize, size_t *pdwRetBuffSize);

-BOOL	DB_GetStaticStringW(HANDLE hContact, LPCSTR lpszModule, LPCSTR lpszValueName, LPWSTR lpszRetBuff, size_t dwRetBuffSize, size_t *pdwRetBuffSize);

-

-BOOL	DB_GetStringA(HANDLE hContact, LPCSTR lpszModule, LPCSTR lpszValueName, CMStringA &Ret);

-BOOL	DB_GetStringW(HANDLE hContact, LPCSTR lpszModule, LPCSTR lpszValueName, CMStringW &Ret);

+struct MraGroupItem

+{

+	MraGroupItem(DWORD id, DWORD flags, const CMStringW &name) :

+		m_id(id), m_flags(flags), m_name(name)

+		{}

 

-BOOL	DB_SetStringExA(HANDLE hContact, LPCSTR lpszModule, LPCSTR lpszValueName, const CMStringA &value);

-BOOL	DB_SetStringExW(HANDLE hContact, LPCSTR lpszModule, LPCSTR lpszValueName, const CMStringW &value);

+	~MraGroupItem()

+	{}

 

-BOOL  DB_GetContactSettingBlob(HANDLE hContact, LPCSTR lpszModule, LPCSTR lpszValueName, LPVOID lpRet, size_t dwRetBuffSize, size_t *pdwRetBuffSize);

+	DWORD     m_id, m_flags;

+	CMStringW m_name;

+};

 

 struct CMraProto : public PROTO<CMraProto>

 {

@@ -179,6 +181,8 @@ struct CMraProto : public PROTO<CMraProto>
 	DWORD    m_dwThreadWorkerRunning;

 	DWORD    dwCMDNum;

 

+	OBJLIST<MraGroupItem> m_groups;

+

 	HANDLE   hAvatarsQueueHandle;

 

 	HGENMENU hMainMenuItems[MAIN_MENU_ITEMS_COUNT+4];