From 87fff9deac0941da4e87728f14c917700d5bbdec Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 27 Aug 2015 17:07:10 +0000
Subject: name conflicts

git-svn-id: http://svn.miranda-ng.org/main/trunk@15046 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/FacebookRM/src/process.cpp | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'protocols/FacebookRM/src/process.cpp')

diff --git a/protocols/FacebookRM/src/process.cpp b/protocols/FacebookRM/src/process.cpp
index b3a700e230..97fd295899 100644
--- a/protocols/FacebookRM/src/process.cpp
+++ b/protocols/FacebookRM/src/process.cpp
@@ -331,12 +331,12 @@ void FacebookProto::ProcessUnreadMessages(void*)
 		facy.handle_success("ProcessUnreadMessages");
 }
 
-void FacebookProto::ProcessUnreadMessage(void *data)
+void FacebookProto::ProcessUnreadMessage(void *pParam)
 {
-	if (data == NULL)
+	if (pParam == NULL)
 		return;
 
-	std::vector<std::string> *threads = (std::vector<std::string>*)data;
+	std::vector<std::string> *threads = (std::vector<std::string>*)pParam;
 
 	if (isOffline()) {
 		delete threads;
@@ -440,21 +440,18 @@ void FacebookProto::ProcessUnreadMessage(void *data)
 	delete threads;
 }
 
-void FacebookProto::LoadLastMessages(void *p)
+void FacebookProto::LoadLastMessages(void *pParam)
 {
-	if (p == NULL)
+	if (pParam == NULL)
 		return;
 
-	if (isOffline()) {
-		delete (MCONTACT*)p;
+	MCONTACT hContact = *(MCONTACT*)pParam;
+	delete (MCONTACT*)pParam;
+
+	if (isOffline())
 		return;
-	}
 
 	facy.handle_entry("LoadLastMessages");
-
-	MCONTACT hContact = *(MCONTACT*)p;
-	delete (MCONTACT*)p;
-
 	if (!isOnline())
 		return;
 
-- 
cgit v1.2.3