massive name conflict resolution

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

1 files changed, 105 insertions, 122 deletions

diff --git a/protocols/AimOscar/src/services.cpp b/protocols/AimOscar/src/services.cpp
index cfa55973a1..27fe595f9a 100644
--- a/protocols/AimOscar/src/services.cpp
+++ b/protocols/AimOscar/src/services.cpp
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 #include "stdafx.h"

 

-INT_PTR CAimProto::GetMyAwayMsg(WPARAM wParam,LPARAM lParam)

+INT_PTR CAimProto::GetMyAwayMsg(WPARAM wParam, LPARAM lParam)

 {

 	char** msgptr = get_status_msg_loc(wParam ? wParam : m_iStatus);

 	if (msgptr == NULL)	return 0;

@@ -28,21 +28,19 @@ INT_PTR CAimProto::GetMyAwayMsg(WPARAM wParam,LPARAM lParam)
 

 int CAimProto::OnIdleChanged(WPARAM, LPARAM lParam)

 {

-	if (state != 1) 

-	{

-		idle=0;

+	if (m_state != 1) {

+		m_idle = 0;

 		return 0;

 	}

 

-	if (instantidle) //ignore- we are instant idling at the moment

+	if (m_instantidle) //ignore- we are instant idling at the moment

 		return 0;

 

 	bool bIdle = (lParam & IDF_ISIDLE) != 0;

 	bool bPrivacy = (lParam & IDF_PRIVACY) != 0;

 

-	if (bPrivacy && idle) 

-	{

-		aim_set_idle(hServerConn,seqno,0);

+	if (bPrivacy && m_idle) {

+		aim_set_idle(m_hServerConn, m_seqno, 0);

 		return 0;

 	}

 

@@ -54,31 +52,29 @@ int CAimProto::OnIdleChanged(WPARAM, LPARAM lParam)
 		MIRANDA_IDLE_INFO mii = { sizeof(mii) };

 		CallService(MS_IDLE_GETIDLEINFO, 0, (LPARAM)&mii);

 

-		idle = 1;

-		aim_set_idle(hServerConn,seqno,mii.idleTime * 60);

+		m_idle = 1;

+		aim_set_idle(m_hServerConn, m_seqno, mii.idleTime * 60);

 	}

-	else aim_set_idle(hServerConn,seqno,0);

+	else aim_set_idle(m_hServerConn, m_seqno, 0);

 

 	return 0;

 }

 

 int CAimProto::OnWindowEvent(WPARAM, LPARAM lParam)

 {

-	MessageWindowEventData* msgEvData  = (MessageWindowEventData*)lParam;

+	MessageWindowEventData* msgEvData = (MessageWindowEventData*)lParam;

 

-	if (msgEvData->uType == MSG_WINDOW_EVT_CLOSE) 

-	{

-		if (state != 1 || !is_my_contact(msgEvData->hContact)) 

+	if (msgEvData->uType == MSG_WINDOW_EVT_CLOSE) {

+		if (m_state != 1 || !is_my_contact(msgEvData->hContact))

 			return 0;

 

 		if (getWord(msgEvData->hContact, AIM_KEY_ST, ID_STATUS_OFFLINE) == ID_STATUS_ONTHEPHONE)

 			return 0;

 

 		DBVARIANT dbv;

-		if (!getBool(msgEvData->hContact, AIM_KEY_BLS, false) && !getString(msgEvData->hContact, AIM_KEY_SN, &dbv)) 

-		{

+		if (!getBool(msgEvData->hContact, AIM_KEY_BLS, false) && !getString(msgEvData->hContact, AIM_KEY_SN, &dbv)) {

 			if (_stricmp(dbv.pszVal, SYSTEM_BUDDY))

-				aim_typing_notification(hServerConn, seqno, dbv.pszVal, 0x000f);

+				aim_typing_notification(m_hServerConn, m_seqno, dbv.pszVal, 0x000f);

 			db_free(&dbv);

 		}

 	}

@@ -87,13 +83,13 @@ int CAimProto::OnWindowEvent(WPARAM, LPARAM lParam)
 

 INT_PTR CAimProto::GetProfile(WPARAM wParam, LPARAM)

 {

-	if (state != 1)

+	if (m_state != 1)

 		return 0;

 

 	DBVARIANT dbv;

 	if (!getString(wParam, AIM_KEY_SN, &dbv)) {

-		request_HTML_profile = 1;

-		aim_query_profile(hServerConn, seqno, dbv.pszVal);

+		m_request_HTML_profile = 1;

+		aim_query_profile(m_hServerConn, m_seqno, dbv.pszVal);

 		db_free(&dbv);

 	}

 	return 0;

@@ -101,14 +97,13 @@ INT_PTR CAimProto::GetProfile(WPARAM wParam, LPARAM)
 

 INT_PTR CAimProto::GetHTMLAwayMsg(WPARAM wParam, LPARAM)

 {

-	if (state != 1)

+	if (m_state != 1)

 		return 0;

 

 	DBVARIANT dbv;

-	if (!getString(wParam, AIM_KEY_SN, &dbv))

-	{

-		request_away_message = 1;

-		aim_query_away_message(hServerConn, seqno, dbv.pszVal);

+	if (!getString(wParam, AIM_KEY_SN, &dbv)) {

+		m_request_away_message = 1;

+		aim_query_away_message(m_hServerConn, m_seqno, dbv.pszVal);

 	}

 	return 0;

 }

@@ -117,15 +112,11 @@ int CAimProto::OnDbSettingChanged(WPARAM hContact, LPARAM lParam)
 {

 	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;

 

-	if (mir_strcmp(cws->szModule, MOD_KEY_CL) == 0 && state == 1 && hContact)

-	{

-		if (mir_strcmp(cws->szSetting, AIM_KEY_NL) == 0)

-		{

-			if (cws->value.type == DBVT_DELETED)

-			{

+	if (mir_strcmp(cws->szModule, MOD_KEY_CL) == 0 && m_state == 1 && hContact) {

+		if (mir_strcmp(cws->szSetting, AIM_KEY_NL) == 0) {

+			if (cws->value.type == DBVT_DELETED) {

 				DBVARIANT dbv;

-				if (!db_get_utf(hContact, MOD_KEY_CL, OTH_KEY_GP, &dbv) && dbv.pszVal[0])

-				{

+				if (!db_get_utf(hContact, MOD_KEY_CL, OTH_KEY_GP, &dbv) && dbv.pszVal[0]) {

 					add_contact_to_group(hContact, dbv.pszVal);

 					db_free(&dbv);

 				}

@@ -133,11 +124,9 @@ int CAimProto::OnDbSettingChanged(WPARAM hContact, LPARAM lParam)
 					add_contact_to_group(hContact, AIM_DEFAULT_GROUP);

 			}

 		}

-		else if (mir_strcmp(cws->szSetting, "MyHandle") == 0)

-		{

-			char* name;

-			switch (cws->value.type)

-			{

+		else if (mir_strcmp(cws->szSetting, "MyHandle") == 0) {

+			char *name;

+			switch (cws->value.type) {

 			case DBVT_DELETED:

 				set_local_nick(hContact, NULL, NULL);

 				break;

@@ -166,28 +155,26 @@ int CAimProto::OnDbSettingChanged(WPARAM hContact, LPARAM lParam)
 

 int CAimProto::OnContactDeleted(WPARAM hContact, LPARAM)

 {

-	if (state != 1) return 0;

+	if (m_state != 1)

+		return 0;

 

 	if (db_get_b(hContact, MOD_KEY_CL, AIM_KEY_NL, 0))

 		return 0;

 

 	DBVARIANT dbv;

-	if (!getString(hContact, AIM_KEY_SN, &dbv)) 

-	{

-		for(int i=1;;++i)

-		{

+	if (!getString(hContact, AIM_KEY_SN, &dbv)) {

+		for (int i = 1;; ++i) {

 			unsigned short item_id = getBuddyId(hContact, i);

-			if (item_id == 0) break; 

+			if (item_id == 0) break;

 

 			unsigned short group_id = getGroupId(hContact, i);

-			if (group_id)

-			{

+			if (group_id) {

 				bool is_not_in_list = getBool(hContact, AIM_KEY_NIL, false);

-				aim_ssi_update(hServerConn, seqno, true);

-				aim_delete_contact(hServerConn, seqno, dbv.pszVal, item_id, group_id, 0, is_not_in_list);

-				char* group = group_list.find_name(group_id);

+				aim_ssi_update(m_hServerConn, m_seqno, true);

+				aim_delete_contact(m_hServerConn, m_seqno, dbv.pszVal, item_id, group_id, 0, is_not_in_list);

+				char *group = m_group_list.find_name(group_id);

 				update_server_group(group, group_id);

-				aim_ssi_update(hServerConn, seqno, false);

+				aim_ssi_update(m_hServerConn, m_seqno, false);

 			}

 		}

 		db_free(&dbv);

@@ -196,24 +183,25 @@ int CAimProto::OnContactDeleted(WPARAM hContact, LPARAM)
 }

 

 

-int CAimProto::OnGroupChange(WPARAM hContact,LPARAM lParam)

+int CAimProto::OnGroupChange(WPARAM hContact, LPARAM lParam)

 {

-	if (state != 1 || !getByte(AIM_KEY_MG, 1)) return 0;

+	if (m_state != 1 || !getByte(AIM_KEY_MG, 1))

+		return 0;

 

-	CLISTGROUPCHANGE* grpchg = (CLISTGROUPCHANGE*)lParam;

+	CLISTGROUPCHANGE *grpchg = (CLISTGROUPCHANGE*)lParam;

 

 	if (hContact == NULL) {

 		if (grpchg->pszNewName == NULL && grpchg->pszOldName != NULL) {

 			T2Utf szOldName(grpchg->pszOldName);

-			unsigned short group_id = group_list.find_id(szOldName);

+			unsigned short group_id = m_group_list.find_id(szOldName);

 			if (group_id) {

-				aim_delete_contact(hServerConn, seqno, szOldName, 0, group_id, 1, false);

-				group_list.remove_by_id(group_id);

+				aim_delete_contact(m_hServerConn, m_seqno, szOldName, 0, group_id, 1, false);

+				m_group_list.remove_by_id(group_id);

 				update_server_group("", 0);

 			}

 		}

 		else if (grpchg->pszNewName != NULL && grpchg->pszOldName != NULL) {

-			unsigned short group_id = group_list.find_id(T2Utf(grpchg->pszOldName));

+			unsigned short group_id = m_group_list.find_id(T2Utf(grpchg->pszOldName));

 			if (group_id)

 				update_server_group(T2Utf(grpchg->pszNewName), group_id);

 		}

@@ -231,7 +219,8 @@ int CAimProto::OnGroupChange(WPARAM hContact,LPARAM lParam)
 

 INT_PTR CAimProto::AddToServerList(WPARAM hContact, LPARAM)

 {

-	if (state != 1) return 0;

+	if (m_state != 1)

+		return 0;

 

 	DBVARIANT dbv;

 	if (!db_get_utf(hContact, MOD_KEY_CL, OTH_KEY_GP, &dbv) && dbv.pszVal[0]) {

@@ -244,7 +233,7 @@ INT_PTR CAimProto::AddToServerList(WPARAM hContact, LPARAM)
 

 INT_PTR CAimProto::BlockBuddy(WPARAM hContact, LPARAM)

 {

-	if (state != 1)

+	if (m_state != 1)

 		return 0;

 

 	unsigned short item_id;

@@ -252,36 +241,36 @@ INT_PTR CAimProto::BlockBuddy(WPARAM hContact, LPARAM)
 	if (getString(hContact, AIM_KEY_SN, &dbv))

 		return 0;

 

-	switch(pd_mode) {

+	switch (m_pd_mode) {

 	case 1:

-		pd_mode = 4;

-		aim_set_pd_info(hServerConn, seqno);

+		m_pd_mode = 4;

+		aim_set_pd_info(m_hServerConn, m_seqno);

 

 	case 4:

-		item_id = block_list.find_id(dbv.pszVal);

+		item_id = m_block_list.find_id(dbv.pszVal);

 		if (item_id != 0) {

-			block_list.remove_by_id(item_id);

-			aim_delete_contact(hServerConn, seqno, dbv.pszVal, item_id, 0, 3, false);

+			m_block_list.remove_by_id(item_id);

+			aim_delete_contact(m_hServerConn, m_seqno, dbv.pszVal, item_id, 0, 3, false);

 		}

 		else {

-			item_id = block_list.add(dbv.pszVal);

-			aim_add_contact(hServerConn, seqno, dbv.pszVal, item_id, 0, 3, false);

+			item_id = m_block_list.add(dbv.pszVal);

+			aim_add_contact(m_hServerConn, m_seqno, dbv.pszVal, item_id, 0, 3, false);

 		}

 		break;

 

 	case 2:

-		pd_mode = 3;

-		aim_set_pd_info(hServerConn, seqno);

+		m_pd_mode = 3;

+		aim_set_pd_info(m_hServerConn, m_seqno);

 

 	case 3:

-		item_id = allow_list.find_id(dbv.pszVal);

+		item_id = m_allow_list.find_id(dbv.pszVal);

 		if (item_id != 0) {

-			allow_list.remove_by_id(item_id);

-			aim_delete_contact(hServerConn, seqno, dbv.pszVal, item_id, 0, 2, false);

+			m_allow_list.remove_by_id(item_id);

+			aim_delete_contact(m_hServerConn, m_seqno, dbv.pszVal, item_id, 0, 2, false);

 		}

 		else {

-			item_id = allow_list.add(dbv.pszVal);

-			aim_add_contact(hServerConn, seqno, dbv.pszVal, item_id, 0, 2);

+			item_id = m_allow_list.add(dbv.pszVal);

+			aim_add_contact(m_hServerConn, m_seqno, dbv.pszVal, item_id, 0, 2);

 		}

 		break;

 	}

@@ -290,7 +279,7 @@ INT_PTR CAimProto::BlockBuddy(WPARAM hContact, LPARAM)
 	return 0;

 }

 

- INT_PTR CAimProto::JoinChatUI(WPARAM, LPARAM)

+INT_PTR CAimProto::JoinChatUI(WPARAM, LPARAM)

 {

 	DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_CHAT), NULL, join_chat_dialog, LPARAM(this));

 	return 0;

@@ -298,11 +287,11 @@ INT_PTR CAimProto::BlockBuddy(WPARAM hContact, LPARAM)
 

 INT_PTR CAimProto::OnJoinChat(WPARAM hContact, LPARAM)

 {

-	if (state != 1)	return 0;

+	if (m_state != 1)

+		return 0;

 

 	DBVARIANT dbv;

-	if (!getString(hContact, "ChatRoomID", &dbv))

-	{

+	if (!getString(hContact, "ChatRoomID", &dbv)) {

 		chatnav_param* par = new chatnav_param(dbv.pszVal, getWord(hContact, "Exchange", 4));

 		ForkThread(&CAimProto::chatnav_request_thread, par);

 		db_free(&dbv);

@@ -312,13 +301,13 @@ INT_PTR CAimProto::OnJoinChat(WPARAM hContact, LPARAM)
 

 INT_PTR CAimProto::OnLeaveChat(WPARAM wParam, LPARAM)

 {

-	if (state != 1)	return 0;

+	if (m_state != 1)

+		return 0;

 

 	MCONTACT hContact = wParam;

 

 	DBVARIANT dbv;

-	if (!getString(hContact, "ChatRoomID", &dbv))

-	{

+	if (!getString(hContact, "ChatRoomID", &dbv)) {

 		chat_leave(dbv.pszVal);

 		db_free(&dbv);

 	}

@@ -339,17 +328,17 @@ INT_PTR CAimProto::ManageAccount(WPARAM, LPARAM)
 

 INT_PTR CAimProto::GetAvatarInfo(WPARAM wParam, LPARAM lParam)

 {

-	PROTO_AVATAR_INFORMATION* pai = (PROTO_AVATAR_INFORMATION*)lParam;

-	

+	PROTO_AVATAR_INFORMATION *pai = (PROTO_AVATAR_INFORMATION*)lParam;

+

 	pai->filename[0] = 0;

 	pai->format = PA_FORMAT_UNKNOWN;

 

-	if (getByte(AIM_KEY_DA, 0)) return GAIR_NOAVATAR;

+	if (getByte(AIM_KEY_DA, 0))

+		return GAIR_NOAVATAR;

 

-	switch (get_avatar_filename(pai->hContact, pai->filename, _countof(pai->filename), NULL))

-	{

+	switch (get_avatar_filename(pai->hContact, pai->filename, _countof(pai->filename), NULL)) {

 	case GAIR_SUCCESS:

-		if (!(wParam & GAIF_FORCE) || state != 1 ) 

+		if (!(wParam & GAIF_FORCE) || m_state != 1)

 			return GAIR_SUCCESS;

 

 	case GAIR_WAITFOR:

@@ -360,8 +349,7 @@ INT_PTR CAimProto::GetAvatarInfo(WPARAM wParam, LPARAM lParam)
 		return GAIR_NOAVATAR;

 	}

 

-	if (state == 1)

-	{

+	if (m_state == 1) {

 		ForkThread(&CAimProto::avatar_request_thread, (void*)pai->hContact);

 		return GAIR_WAITFOR;

 	}

@@ -420,56 +408,52 @@ INT_PTR CAimProto::GetAvatar(WPARAM wParam, LPARAM lParam)
 

 INT_PTR CAimProto::SetAvatar(WPARAM, LPARAM lParam)

 {

-	TCHAR* szFileName = (TCHAR*)lParam;

+	TCHAR *szFileName = (TCHAR*)lParam;

 

-	if (state != 1) return 1;

+	if (m_state != 1)

+		return 1;

 

-	if (szFileName == NULL)

-	{

-		aim_ssi_update(hServerConn, seqno, true);

-		aim_delete_avatar_hash(hServerConn, seqno, 1, 1, avatar_id_sm);

-		aim_delete_avatar_hash(hServerConn, seqno, 1, 12, avatar_id_lg);

-		aim_ssi_update(hServerConn, seqno, false);

+	if (szFileName == NULL) {

+		aim_ssi_update(m_hServerConn, m_seqno, true);

+		aim_delete_avatar_hash(m_hServerConn, m_seqno, 1, 1, m_avatar_id_sm);

+		aim_delete_avatar_hash(m_hServerConn, m_seqno, 1, 12, m_avatar_id_lg);

+		aim_ssi_update(m_hServerConn, m_seqno, false);

 

 		avatar_request_handler(NULL, NULL, 0);

 	}

-	else

-	{

+	else {

 		char hash[16], hash1[16], *data, *data1 = NULL;

 		unsigned short size, size1 = 0;

 

-		if (!get_avatar_hash(szFileName, hash, &data, size))

-		{

+		if (!get_avatar_hash(szFileName, hash, &data, size)) {

 			mir_free(hash);

 			return 1;

 		}

 

 		rescale_image(data, size, data1, size1);

 

-		if (size1)

-		{

+		if (size1) {

 			mir_md5_state_t state;

 			mir_md5_init(&state);

 			mir_md5_append(&state, (unsigned char*)data1, size1);

 			mir_md5_finish(&state, (unsigned char*)hash1);

 

-			mir_free(hash_lg); 	hash_lg = bytes_to_string(hash, sizeof(hash));

-			mir_free(hash_sm); 	hash_sm = bytes_to_string(hash1, sizeof(hash1));

+			mir_free(m_hash_lg); m_hash_lg = bytes_to_string(hash, sizeof(hash));

+			mir_free(m_hash_sm); m_hash_sm = bytes_to_string(hash1, sizeof(hash1));

 

-			aim_ssi_update(hServerConn, seqno, true);

-			aim_set_avatar_hash(hServerConn, seqno, 1, 1, avatar_id_sm, 16, hash1);

-			aim_set_avatar_hash(hServerConn, seqno, 1, 12, avatar_id_lg, 16, hash);

-			aim_ssi_update(hServerConn, seqno, false);

+			aim_ssi_update(m_hServerConn, m_seqno, true);

+			aim_set_avatar_hash(m_hServerConn, m_seqno, 1, 1, m_avatar_id_sm, 16, hash1);

+			aim_set_avatar_hash(m_hServerConn, m_seqno, 1, 12, m_avatar_id_lg, 16, hash);

+			aim_ssi_update(m_hServerConn, m_seqno, false);

 		}

-		else

-		{

-			mir_free(hash_lg); 	hash_lg = NULL;

-			mir_free(hash_sm); 	hash_sm = bytes_to_string(hash, sizeof(hash1));

-

-			aim_ssi_update(hServerConn, seqno, true);

-			aim_set_avatar_hash(hServerConn, seqno, 1, 1, avatar_id_sm, 16, hash);

-			aim_delete_avatar_hash(hServerConn, seqno, 1, 12, avatar_id_lg);

-			aim_ssi_update(hServerConn, seqno, false);

+		else {

+			mir_free(m_hash_lg); m_hash_lg = NULL;

+			mir_free(m_hash_sm); m_hash_sm = bytes_to_string(hash, sizeof(hash1));

+

+			aim_ssi_update(m_hServerConn, m_seqno, true);

+			aim_set_avatar_hash(m_hServerConn, m_seqno, 1, 1, m_avatar_id_sm, 16, hash);

+			aim_delete_avatar_hash(m_hServerConn, m_seqno, 1, 12, m_avatar_id_lg);

+			aim_ssi_update(m_hServerConn, m_seqno, false);

 		}

 

 		avatar_request_handler(NULL, NULL, 0);

@@ -481,12 +465,11 @@ INT_PTR CAimProto::SetAvatar(WPARAM, LPARAM lParam)
 		TCHAR *ext = _tcsrchr(szFileName, '.');

 		get_avatar_filename(NULL, tFileName, _countof(tFileName), ext);

 		int fileId = _topen(tFileName, _O_CREAT | _O_TRUNC | _O_WRONLY | O_BINARY, _S_IREAD | _S_IWRITE);

-		if (fileId < 0)

-		{

+		if (fileId < 0) {

 			char errmsg[512];

 			mir_snprintf(errmsg, _countof(errmsg), "Cannot store avatar. File '%s' could not be created/overwritten", tFileName);

 			ShowPopup(errmsg, ERROR_POPUP);

-			return 1; 

+			return 1;

 		}

 		_write(fileId, data, size);

 		_close(fileId);